bors [Tue, 13 Dec 2016 18:55:46 +0000 (18:55 +0000)]
Auto merge of #3395 - alexcrichton:fix-appveyor, r=alexcrichton
Pin to an older version of rustup temporarily
cc #3394
Alex Crichton [Tue, 13 Dec 2016 18:49:45 +0000 (10:49 -0800)]
Pin to an older version of rustup temporarily
cc #3394
bors [Mon, 12 Dec 2016 19:24:38 +0000 (19:24 +0000)]
Auto merge of #3392 - matklad:patch-1, r=steveklabnik
Add explanatory comment to header.html
See #3387
Aleksey Kladov [Mon, 12 Dec 2016 18:28:25 +0000 (21:28 +0300)]
Add explanatory comment to header.html
See #3387
bors [Thu, 8 Dec 2016 23:55:15 +0000 (23:55 +0000)]
Auto merge of #3221 - euclio:test-all, r=alexcrichton
Add `--all` flag to `cargo test`
Work towards #2878.
This flag allows a user to test all members of a workspace by using `cargo test --all`. The command is also supported when using a virtual workspace manifest.
Andy Russell [Thu, 8 Dec 2016 22:32:33 +0000 (17:32 -0500)]
replace `current_opt` with membership check
Andy Russell [Fri, 2 Dec 2016 21:03:42 +0000 (16:03 -0500)]
fix formatting issues
Andy Russell [Fri, 2 Dec 2016 20:28:40 +0000 (15:28 -0500)]
remove unused argument to `Context::lib_profile`
Andy Russell [Fri, 2 Dec 2016 20:21:31 +0000 (15:21 -0500)]
remove unnecessary usage of `current_opt`
Andy Russell [Fri, 2 Dec 2016 19:40:37 +0000 (14:40 -0500)]
avoid round-tripping through string
Andy Russell [Fri, 2 Dec 2016 19:30:16 +0000 (14:30 -0500)]
remove unnecessary match
Andy Russell [Wed, 16 Nov 2016 21:04:31 +0000 (16:04 -0500)]
show warnings for all members of the workspace
Andy Russell [Wed, 16 Nov 2016 20:26:18 +0000 (15:26 -0500)]
pass `Packages` into resolve dependencies
Andy Russell [Wed, 16 Nov 2016 19:31:06 +0000 (14:31 -0500)]
remove current_package from context
Andy Russell [Thu, 20 Oct 2016 20:14:54 +0000 (16:14 -0400)]
add `--all` flag to `cargo-test`
Andy Russell [Fri, 21 Oct 2016 03:57:51 +0000 (23:57 -0400)]
avoid panic when virtual workspace has no members
bors [Wed, 7 Dec 2016 08:11:16 +0000 (08:11 +0000)]
Auto merge of #3361 - pwoolcoc:default-build-script, r=alexcrichton
Assume `build.rs` in the same directory as `Cargo.toml` is a build script (unless explicitly told not to)
So, in May I posted a question in the #cargo IRC room: https://botbot.me/mozilla/cargo/2016-05-26/?msg=
66770068&page=1
This PR does what was discussed there. If `cargo` sees a `build.rs` in the same directory as the `Cargo.toml`, it will assume `build.rs` is a build script unless `package.build = false`. Just for completeness I also made `build = true` mean the same as `build = "build.rs"` but I'm not sure if that is okay or not.
Paul Woolcock [Tue, 6 Dec 2016 15:07:52 +0000 (10:07 -0500)]
change this to only emit a warning right now
bors [Tue, 6 Dec 2016 06:59:46 +0000 (06:59 +0000)]
Auto merge of #3372 - alexcrichton:sha256, r=alexcrichton
Upload sha256 sums of cargo artifacts
Alex Crichton [Tue, 6 Dec 2016 06:54:11 +0000 (22:54 -0800)]
Upload sha256 sums of cargo artifacts
bors [Tue, 6 Dec 2016 01:23:17 +0000 (01:23 +0000)]
Auto merge of #3319 - alexcrichton:more-info, r=brson
Emit more info on --message-format=json
This adds more output on Cargo's behalf to the output of
`--message-format=json`. Cargo will now emit a message when a crate is finished
compiling with a list of all files that were just generated along with a message
when a build script finishes executing with linked libraries and linked library
paths.
Closes #3212
Paul Woolcock [Mon, 5 Dec 2016 18:02:13 +0000 (13:02 -0500)]
correct typo
Paul Woolcock [Mon, 5 Dec 2016 14:41:03 +0000 (09:41 -0500)]
Using layout.root here should be sufficient
bors [Fri, 2 Dec 2016 23:39:49 +0000 (23:39 +0000)]
Auto merge of #3356 - ibabushkin:feature-build-rustflags, r=alexcrichton
Implemented string lookup for `build.rustflags` config key
This addresses the immediate issue described in #3052 .
I am, however, unsure about the current state of the deeper issues mentioned in that issue, but if needed, I can take stab at them as well. :)
bors [Fri, 2 Dec 2016 22:33:17 +0000 (22:33 +0000)]
Auto merge of #3362 - alexcrichton:slower-ssl, r=alexcrichton
Use -j1 on recursive make for OpenSSL
It looks like OpenSSL building on OSX has races...
Alex Crichton [Fri, 2 Dec 2016 22:27:37 +0000 (14:27 -0800)]
Use -j1 on recursive make for OpenSSL
It looks like OpenSSL building on OSX has races...
Paul Woolcock [Fri, 2 Dec 2016 04:01:51 +0000 (23:01 -0500)]
Tests for new `package.build` behavior
Paul Woolcock [Fri, 2 Dec 2016 03:42:45 +0000 (22:42 -0500)]
Assume build = 'build.rs' by default
This change makes cargo assume `build = "build.rs"` if there is a
`build.rs` file in the same directory as `Cargo.toml`. However, you
can set `build = false` to prevent this.
Inokentiy Babushkin [Fri, 2 Dec 2016 18:43:37 +0000 (19:43 +0100)]
Refactored ugly rustflags lookup code into a separate function.
Alex Crichton [Wed, 23 Nov 2016 16:29:36 +0000 (08:29 -0800)]
Emit more info on --message-format=json
This adds more output on Cargo's behalf to the output of
`--message-format=json`. Cargo will now emit a message when a crate is finished
compiling with a list of all files that were just generated along with a message
when a build script finishes executing with linked libraries and linked library
paths.
Closes #3212
bors [Fri, 2 Dec 2016 17:31:04 +0000 (17:31 +0000)]
Auto merge of #3358 - tshepang:formatting, r=alexcrichton
doc: fix code formatting
Inokentiy Babushkin [Fri, 2 Dec 2016 15:00:58 +0000 (16:00 +0100)]
Fixed broken testcase for string-based form of rustflags config key.
bors [Fri, 2 Dec 2016 14:37:52 +0000 (14:37 +0000)]
Auto merge of #3348 - alexcrichton:fix-checksums, r=brson
Fix retrying crate downloads for network errors
Previously the `with_retry` loop was a little too tight where stale state about
the sha256 and data was kept out of the loop. Instead we need to reinitialize
these on each iteration of the loop to ensure that we correctly retry by
forgetting the data we previously downloaded for an aborted download attempt.
bors [Fri, 2 Dec 2016 13:23:38 +0000 (13:23 +0000)]
Auto merge of #3338 - alexcrichton:correct-vers-flag, r=brson
Require `cargo install --vers` takes a semver version
Historically Cargo accidentally took a semver version *requirement*, so let's
start issuing warnings about how this is now legacy behavior.
Closes #3321
bors [Fri, 2 Dec 2016 12:15:18 +0000 (12:15 +0000)]
Auto merge of #3335 - alexcrichton:fix-xcomiple, r=brson
Add host dependency path via -L for cross compiles
Now that proc-macro crates can reexport from their dependencies we need to be
able to find the other crates, so ensure that we pass an appropriate -L flag.
Closes #3334
Alex Crichton [Mon, 28 Nov 2016 15:27:14 +0000 (07:27 -0800)]
Add host dependency path via -L for cross compiles
Now that proc-macro crates can reexport from their dependencies we need to be
able to find the other crates, so ensure that we pass an appropriate -L flag.
Closes #3334
bors [Fri, 2 Dec 2016 03:20:54 +0000 (03:20 +0000)]
Auto merge of #3336 - alexcrichton:fix-warning, r=brson
Test for bad path overrides with summaries
Bad path overrides are currently detected to issue warnings in cases where path
overrides are not suitable and have exhibited buggy behavior in the past.
Unfortunately though it looks like some false positives are being issued,
causing unnecessary confusion about `paths` overrides.
This commit fixes the detection of these "bad path overrides" by comparing
`Summary` dependencies (what's written down in `Cargo.toml`) rather than
comparing the `Cargo.toml` of the override with `Cargo.lock`. We're guaranteed
that the package we're overridding has already been resolved into `Cargo.lock`,
so we know that if the two `Cargo.toml` files are equivalent we'll continue
with the same crate graph.
I'm not actually entirely sure why I originally thought it'd be better to go
through the `Cargo.lock` comparison route. Unfortunately that doesn't take into
account optional deps which aren't in `Cargo.lock` but are in `Cargo.toml` of
the override, causing the false positive. This method, however, simply ensures
that the two dependency lists are the same.
Closes #3313
Tshepang Lekhonkhobe [Thu, 1 Dec 2016 20:08:59 +0000 (22:08 +0200)]
doc: fix code formatting
bors [Fri, 2 Dec 2016 00:05:12 +0000 (00:05 +0000)]
Auto merge of #3310 - alexcrichton:more-metadata-hashing, r=brson
Apply new fingerprinting to build dir outputs
We now much more aggressively cache the output of the compiler based on feature
sets and profile configuration. Unfortunately we forgot to extend this caching
to build script output directories as well so this commit ensures that build
script outputs are cached the same way with a directory per configuration of
features and output settings.
Closes #3302
Inokentiy Babushkin [Thu, 1 Dec 2016 23:03:49 +0000 (00:03 +0100)]
Improved error handling to reflect the actual situation, added tests
* One of the tests still doesn't pass, this needs further investigation
bors [Thu, 1 Dec 2016 22:10:06 +0000 (22:10 +0000)]
Auto merge of #3357 - tshepang:no-exist, r=steveklabnik
doc: remove reference to non-existent function
bors [Thu, 1 Dec 2016 20:12:40 +0000 (20:12 +0000)]
Auto merge of #3354 - alexcrichton:less-snapshots, r=alexcrichton
Delete old snapshot infrastructure
No longer used
Tshepang Lekhonkhobe [Thu, 1 Dec 2016 19:59:03 +0000 (21:59 +0200)]
doc: remove reference to non-existent function
bors [Thu, 1 Dec 2016 19:01:17 +0000 (19:01 +0000)]
Auto merge of #3355 - alexcrichton:change-buckets, r=alexcrichton
Upload to a different bucket
Inokentiy Babushkin [Thu, 1 Dec 2016 18:57:05 +0000 (19:57 +0100)]
Implemented string lookup for `build.rustflags` config key
Alex Crichton [Thu, 1 Dec 2016 18:23:48 +0000 (10:23 -0800)]
Upload to a different bucket
Alex Crichton [Thu, 1 Dec 2016 17:18:47 +0000 (09:18 -0800)]
Delete old snapshot infrastructure
No longer used
bors [Thu, 1 Dec 2016 07:49:11 +0000 (07:49 +0000)]
Auto merge of #3350 - alexcrichton:more-tweaks, r=alexcrichton
Slight tweaks to CI
* Pass `--quiet` to all tests to have some quieter output
* Skip builds on the `master` branch as `auto` is already checked
* Check the right env var for repo branches on appveyor
Alex Crichton [Wed, 30 Nov 2016 19:12:49 +0000 (11:12 -0800)]
Slight tweaks to CI
* Pass `--quiet` to all tests to have some quieter output
* Skip builds on branches other than `auto-cargo` as it's already checked
* Check the right env var for repo branches on appveyor
* Only run a few builds on PRs
Alex Crichton [Wed, 30 Nov 2016 00:52:20 +0000 (16:52 -0800)]
Fix retrying crate downloads for network errors
Previously the `with_retry` loop was a little too tight where stale state about
the sha256 and data was kept out of the loop. Instead we need to reinitialize
these on each iteration of the loop to ensure that we correctly retry by
forgetting the data we previously downloaded for an aborted download attempt.
bors [Thu, 1 Dec 2016 01:32:51 +0000 (01:32 +0000)]
Auto merge of #3347 - ibabushkin:master, r=alexcrichton
Reordered rustc arguments.
This adresses #3276 .
Some tests I can't run locally might still fail, I'm fixing those.
The core change is rather trivial, simply reorder some existing code, and update tests to match the new results.
Inokentiy Babushkin [Wed, 30 Nov 2016 20:05:23 +0000 (21:05 +0100)]
Fixed a few additional tests.
Inokentiy Babushkin [Wed, 30 Nov 2016 19:42:44 +0000 (20:42 +0100)]
Fixed type breaking some tests.
Inokentiy Babushkin [Wed, 30 Nov 2016 19:04:14 +0000 (20:04 +0100)]
Changed another batch of tests to account for new rustc argument order.
bors [Wed, 30 Nov 2016 18:16:39 +0000 (18:16 +0000)]
Auto merge of #3345 - alexcrichton:release-branches, r=alexcrichton
Add support for release branches in Cargo
Follow the same strategy as the compiler for now in basically every respect:
* Add new `--release-channel` configure option, defaulting to `dev`
* Remove old `--enable-nightly`
* Add `--enable-build-openssl` as an orthogonal option
* Hook up Travis/AppVeyor to stable/beta/master branches to do the right
channel builds.
Alex Crichton [Tue, 29 Nov 2016 14:36:31 +0000 (06:36 -0800)]
Add support for release branches in Cargo
Follow the same strategy as the compiler for now in basically every respect:
* Add new `--release-channel` configure option, defaulting to `dev`
* Remove old `--enable-nightly`
* Add `--enable-build-openssl` as an orthogonal option
* Hook up Travis/AppVeyor to stable/beta/master branches to do the right
channel builds.
Inokentiy Babushkin [Wed, 30 Nov 2016 07:49:00 +0000 (08:49 +0100)]
Another test update for the argument order changetest update for the argument order change. Please enter the commit message for your changes. Lines starting
Inokentiy Babushkin [Wed, 30 Nov 2016 00:05:55 +0000 (01:05 +0100)]
Updated one more test to fit new rustc argument order.
Inokentiy Babushkin [Tue, 29 Nov 2016 23:11:58 +0000 (00:11 +0100)]
[WIP] Reordered rustc arguments.
bors [Tue, 29 Nov 2016 01:03:38 +0000 (19:03 -0600)]
Auto merge of #3342 - alexcrichton:fix-ssl, r=alexcrichton
Bump git2 dep to fix SSL paths
This commit includes alexcrichton/git2-rs@
a8f4a7faa which switches the order of
initialization of libgit2. That commit ensures that the relevant env vars which
a statically linked OpenSSL needs to function are set before libgit2 is
initialized to ensure that libgit2 uses them.
This was regressed accidentally in alexcrichton/git2-rs@
071902aa when
initialization was tweaked.
Closes #3340
Alex Crichton [Mon, 28 Nov 2016 23:48:10 +0000 (15:48 -0800)]
Bump git2 dep to fix SSL paths
This commit includes alexcrichton/git2-rs@
a8f4a7faa which switches the order of
initialization of libgit2. That commit ensures that the relevant env vars which
a statically linked OpenSSL needs to function are set before libgit2 is
initialized to ensure that libgit2 uses them.
This was regressed accidentally in alexcrichton/git2-rs@
071902aa when
initialization was tweaked.
Closes #3340
bors [Mon, 28 Nov 2016 21:00:19 +0000 (15:00 -0600)]
Auto merge of #3339 - SimonSapin:git-short-id, r=alexcrichton
Use short IDs in git dependencies checkout path
… in order to contribute less to the path length limit on Windows: https://github.com/servo/servo/pull/14397
Simon Sapin [Mon, 28 Nov 2016 20:41:21 +0000 (21:41 +0100)]
Use short IDs in git dependencies checkout path
… in order to contribute less to the path length limit on Windows:
https://github.com/servo/servo/pull/14397
Alex Crichton [Mon, 21 Nov 2016 20:32:10 +0000 (12:32 -0800)]
Apply new fingerprinting to build dir outputs
We now much more aggressively cache the output of the compiler based on feature
sets and profile configuration. Unfortunately we forgot to extend this caching
to build script output directories as well so this commit ensures that build
script outputs are cached the same way with a directory per configuration of
features and output settings.
Closes #3302
Alex Crichton [Mon, 21 Nov 2016 18:05:55 +0000 (10:05 -0800)]
Refactor metadata generation
Remove generation all the way in manifest-parsing and defer it until we actually
need it during compilation. Additionally remove lots of weird logic that's no
longer necessary that we're hashing quite a few fields.
Alex Crichton [Mon, 28 Nov 2016 17:48:14 +0000 (09:48 -0800)]
Require `cargo install --vers` takes a semver version
Historically Cargo accidentally took a semver version *requirement*, so let's
start issuing warnings about how this is now legacy behavior.
Closes #3321
Alex Crichton [Mon, 28 Nov 2016 16:51:36 +0000 (08:51 -0800)]
Test for bad path overrides with summaries
Bad path overrides are currently detected to issue warnings in cases where path
overrides are not suitable and have exhibited buggy behavior in the past.
Unfortunately though it looks like some false positives are being issued,
causing unnecessary confusion about `paths` overrides.
This commit fixes the detection of these "bad path overrides" by comparing
`Summary` dependencies (what's written down in `Cargo.toml`) rather than
comparing the `Cargo.toml` of the override with `Cargo.lock`. We're guaranteed
that the package we're overridding has already been resolved into `Cargo.lock`,
so we know that if the two `Cargo.toml` files are equivalent we'll continue
with the same crate graph.
I'm not actually entirely sure why I originally thought it'd be better to go
through the `Cargo.lock` comparison route. Unfortunately that doesn't take into
account optional deps which aren't in `Cargo.lock` but are in `Cargo.toml` of
the override, causing the false positive. This method, however, simply ensures
that the two dependency lists are the same.
Closes #3313
bors [Sat, 26 Nov 2016 23:40:40 +0000 (17:40 -0600)]
Auto merge of #3332 - alexcrichton:build-openssl, r=alexcrichton
Compile OpenSSL from source on OSX
I'm seeing a bunch of weird illegal instructions on OSX nightlies for
Cargo. My guess is that they're all related to OpenSSL linking. Right
now we're linking from Homebrew but I have a sneaking suspicion that it
compiles with `-march=native` rather than what we'd like as a portable
binary. To work around this compile OpenSSL ourselves and link it that
way.
Note that I believe this won't bring in the certificate trust store of
OpenSSL on OSX (or at least not the right one from the keychain). We
shouldn't need that, however, as OpenSSL is just used as the
cryptographic primitives in libssh2 and Cargo itself. So in that sense
we shouldn't need it for actually SSL at all.
Alex Crichton [Sat, 26 Nov 2016 22:37:27 +0000 (14:37 -0800)]
Compile OpenSSL from source on OSX
I'm seeing a bunch of weird illegal instructions on OSX nightlies for
Cargo. My guess is that they're all related to OpenSSL linking. Right
now we're linking from Homebrew but I have a sneaking suspicion that it
compiles with `-march=native` rather than what we'd like as a portable
binary. To work around this compile OpenSSL ourselves and link it that
way.
Note that I believe this won't bring in the certificate trust store of
OpenSSL on OSX (or at least not the right one from the keychain). We
shouldn't need that, however, as OpenSSL is just used as the
cryptographic primitives in libssh2 and Cargo itself. So in that sense
we shouldn't need it for actually SSL at all.
bors [Sat, 26 Nov 2016 17:12:07 +0000 (11:12 -0600)]
Auto merge of #3331 - alexcrichton:fix-segfaults, r=alexcrichton
Update git2 fixing initialization races
This updates libgit2/libssh2 bindings to fix initialization races in
OpenSSL. This should fix some of the spurious segfaults we've been
seeing on Travis OSX.
Alex Crichton [Sat, 26 Nov 2016 17:11:08 +0000 (09:11 -0800)]
Update git2 fixing initialization races
This updates libgit2/libssh2 bindings to fix initialization races in
OpenSSL. This should fix some of the spurious segfaults we've been
seeing on Travis OSX.
bors [Fri, 25 Nov 2016 23:28:37 +0000 (17:28 -0600)]
Auto merge of #3326 - tbu-:pr_bump_git2_061, r=alexcrichton
Bump git2 dependency to fix #3312
Tobias Bucher [Thu, 24 Nov 2016 23:13:57 +0000 (00:13 +0100)]
Bump git2 dependency to fix #3312
bors [Thu, 24 Nov 2016 17:59:29 +0000 (11:59 -0600)]
Auto merge of #3325 - alexcrichton:fix-flaky, r=alexcrichton
Make a freshness test less flaky
We can't rely on frobbing mtimes, need to actually just wait a whole
second.
Alex Crichton [Thu, 24 Nov 2016 17:58:46 +0000 (09:58 -0800)]
Make a freshness test less flaky
We can't rely on frobbing mtimes, need to actually just wait a whole
second.
bors [Wed, 23 Nov 2016 05:41:52 +0000 (23:41 -0600)]
Auto merge of #3315 - alexcrichton:fix-travis, r=alexcrichton
Really fix OSX nightlies
After #3311 we're now correctly trying to link OpenSSL statically on
OSX. Unfortunately though this is failing to complete on the builders.
Turns out the way we install OpenSSL through Homebrew create "universal
archives" which is essentially an archive with both i686 and x86_64
object files, but separated. The linker takes care of this just fine but
rustc currently chokes on it, unable to include the library statically
into the compiler.
To work around this we prepare our own mini install of OpenSSL by
copying relevant bits into a local directory (like we do on Linux). As
part of this we use the `lipo` tool, which is used to manage these fat
archives, to disassemble the archive and only extract the relevant
architecture. This should make a pre-installation step which both
extracts the information and configures Cargo to use it.
This should also fix the errors we're seeing on Travis I believe.
Alex Crichton [Wed, 23 Nov 2016 05:37:26 +0000 (21:37 -0800)]
Really fix OSX nightlies
After #3311 we're now correctly trying to link OpenSSL statically on
OSX. Unfortunately though this is failing to complete on the builders.
Turns out the way we install OpenSSL through Homebrew create "universal
archives" which is essentially an archive with both i686 and x86_64
object files, but separated. The linker takes care of this just fine but
rustc currently chokes on it, unable to include the library statically
into the compiler.
To work around this we prepare our own mini install of OpenSSL by
copying relevant bits into a local directory (like we do on Linux). As
part of this we use the `lipo` tool, which is used to manage these fat
archives, to disassemble the archive and only extract the relevant
architecture. This should make a pre-installation step which both
extracts the information and configures Cargo to use it.
This should also fix the errors we're seeing on Travis I believe.
bors [Mon, 21 Nov 2016 21:18:02 +0000 (15:18 -0600)]
Auto merge of #3311 - alexcrichton:fix-nightlies, r=brson
Link OpenSSL statically on OSX
Now that Cargo requires OpenSSL >= 1.0.1 transitively through the `openssl-sys`
0.9 release the dynamic libraries for OpenSSL are no longer located on OSX by
default. This means that the support necessary for libssh2 needs to be
statically linked rather than dynamically linked.
Closes #3303
Alex Crichton [Mon, 21 Nov 2016 20:36:30 +0000 (12:36 -0800)]
Link OpenSSL statically on OSX
Now that Cargo requires OpenSSL >= 1.0.1 transitively through the `openssl-sys`
0.9 release the dynamic libraries for OpenSSL are no longer located on OSX by
default. This means that the support necessary for libssh2 needs to be
statically linked rather than dynamically linked.
Closes #3303
bors [Fri, 18 Nov 2016 20:32:20 +0000 (12:32 -0800)]
Auto merge of #3251 - alexcrichton:fix-regr, r=brson
Fix regression with path overrides
If an override points to a path dependency then that's not locked, so we're
missing information for that, but it's already warned about, so no need to
worry.
Closes #3288
bors [Thu, 17 Nov 2016 20:45:11 +0000 (12:45 -0800)]
Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton
Fix tests on nightly
Alex Crichton [Thu, 17 Nov 2016 20:21:13 +0000 (12:21 -0800)]
Fix tests on nightly
bors [Thu, 17 Nov 2016 00:14:07 +0000 (16:14 -0800)]
Auto merge of #3297 - alexcrichton:bump, r=brson
Bump to 0.16.0
Alex Crichton [Thu, 17 Nov 2016 00:05:31 +0000 (16:05 -0800)]
Bump to 0.16.0
bors [Wed, 16 Nov 2016 15:02:22 +0000 (07:02 -0800)]
Auto merge of #3102 - nipunn1313:attempt, r=alexcrichton
Mix feature flags into fingerprint/metadata shorthash
Since building dependencies results in different libraries
depending on the feature flags, I added the feature flags into
the short_hash.
This solves an issue when multiple crates share a target directory
or multiple targets share a common library with divergent feature
flag choice.
I'm not sure if this architecturally the best way to solve this problem, but I did confirm that this fixes the issue I was seeing. I can also add a test for this case if this code is taking the right approach (or if it would help illustrate the issue).
Nipunn Koorapati [Wed, 16 Nov 2016 07:46:57 +0000 (23:46 -0800)]
Target_env -> Target_os
Nipunn Koorapati [Wed, 16 Nov 2016 06:48:21 +0000 (22:48 -0800)]
Ignore killing_cargo_releases_the_lock on windows
Nipunn Koorapati [Tue, 15 Nov 2016 19:53:24 +0000 (11:53 -0800)]
Merge branch 'master' into attempt
- Fix instances of try! converting to ? syntax
Alex Crichton [Fri, 4 Nov 2016 00:00:13 +0000 (17:00 -0700)]
Fix regression with path overrides
If an override points to a path dependency then that's not locked, so we're
missing information for that, but it's already warned about, so no need to
worry.
bors [Tue, 15 Nov 2016 18:44:46 +0000 (10:44 -0800)]
Auto merge of #3286 - rjgoldsborough:build-script-docs-mistake-336, r=alexcrichton
fixing build script docs mistakes
Fixes https://github.com/rust-lang/crates.io/issues/336
Nipunn Koorapati [Tue, 15 Nov 2016 17:51:12 +0000 (09:51 -0800)]
Ignore the flaky lock test on older windows
bors [Tue, 15 Nov 2016 17:03:49 +0000 (09:03 -0800)]
Auto merge of #3283 - saschagrunert:master, r=alexcrichton
Changed try! macros to ? operator
Since the stabilization of the ? operator (release 1.13.0)
the ? operator should be used to use idiomatic Rust.
bors [Tue, 15 Nov 2016 15:07:57 +0000 (07:07 -0800)]
Auto merge of #3294 - sanxiyn:unused-type-alias, r=alexcrichton
Remove unused type aliases
Found by rust-lang/rust#37631 and necessary to land because of cargotest.
Seo Sanghyeon [Tue, 15 Nov 2016 12:49:41 +0000 (21:49 +0900)]
Remove unused type aliases
Sascha Grunert [Tue, 15 Nov 2016 06:44:13 +0000 (07:44 +0100)]
Changed rustversion to the last successful nightly
bors [Mon, 14 Nov 2016 21:56:07 +0000 (13:56 -0800)]
Auto merge of #3272 - cuviper:openssl-1.1.0, r=alexcrichton
Update dependencies for OpenSSL 1.1.0 compatibility
The primary targets here are openssl and openssl-sys crates 0.9,
bringing support for OpenSSL 1.1.0. This requires updating the curl
and git2 related dependencies as well.
A small change is required in cargo itself for the new Hasher API.
Results from the hasher are simply unwrapped for now, matching the
Windows behavior that already panics on error.
Alex Crichton [Wed, 9 Nov 2016 15:11:16 +0000 (07:11 -0800)]
More updates for OpenSSL 1.1.0
Sascha Grunert [Mon, 14 Nov 2016 17:02:41 +0000 (18:02 +0100)]
Changed rustversion to 2016-11-05
Nipunn Koorapati [Sun, 13 Nov 2016 06:16:56 +0000 (22:16 -0800)]
Fix one more [/] in env-var test for windows
Nipunn Koorapati [Sun, 13 Nov 2016 05:49:44 +0000 (21:49 -0800)]
Fix dll prefix/suffix test for windows